Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am: 5b78b0015e
am: dff5d48b7e

Change-Id: I4e419bcce7375da6b09c01c6a78e127de6dbf189