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

am skip reason: subject contains skip directive

Change-Id: I1d1356db4a00fec870d754117fcda0bbd44724b7