[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313

Change-Id: I49cbda7a4d9643808cc9c164970a6ee630b2233c