Merge "RESTRICT AUTOMERGE: Always use safe labels" into oc-dev
am: de433776a0

Change-Id: Ib024b03ce210171f63d497cf8bdf8ff7b705ec31