Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46fb

Change-Id: Icc872c5ed01ce4b788fad5e3670748c5a218a02f