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

Change-Id: I6c7d8fb0bf4b8f77f1dfa803a4581129097104cb