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

am skip reason: subject contains skip directive

Change-Id: I3dcf22787d8d07d42285e2b62b7ef5ac518437fc