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

Change-Id: Ib19276259710ab204954e01e7519946cf7488f68