[automerger] Make safe label more safe am: 2263da95 am: 05086b10 am: 77f44906 am: 46f45633 am: 6be1d671 Change-Id: I68cc7356fb9069b8e59913e5524955c241990c8c