[automerger skipped] Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev am: 5b78b0015e am: dff5d48b7e
am: cc22fcc295  -s ours

Change-Id: Ie86f686d9216e04ddd11fd75b1fb5fa8a25ab751