[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: 0c6de1676d -s ours am: 84ddcd2bda -s ours

am skip reason: subject contains skip directive

Change-Id: I90b90989e8a70d0d1fafd4dc8b3474bd2b783bcb