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

Change-Id: I384663994a8d33e5479914fb394c367e1d77fbbb