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

am skip reason: subject contains skip directive

Change-Id: Ie0e0906cf86cc9ee86e61813896a8d56882a4750