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

Change-Id: I18e8dd67aa2d88c2ab60f953371e09c3c53154a3