[automerger skipped] Merge "RESTRICT AUTOMERGE: Always use safe labels" into oc-dev am: de433776a0 am: af0d8f7442 am: 605da689f5  -s ours
am: 259cd82090

Change-Id: Ib528b580900a1447a973fd8d84e2693fc166e0e1