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

am skip reason: subject contains skip directive

Change-Id: I15c5f086463e34da186456659cf88d44ca8e829e