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

Change-Id: I288c3bebf15bdb03659a33618d5fff48770243f3