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

Change-Id: Ia0fefe4ca6d6016b004fa4ff96aa3b272aab7b0b