[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb am: 7461be09bd am: bbd74617ac -s ours

am skip reason: subject contains skip directive

Change-Id: Ib362ea5f60af604f6966b98b943a4c1e8e57efdc