Merge "RESTRICT AUTOMERGE Protect against possible race conditions" into nyc-dev am: d1c3cd5c2a am: c36f61370c
am: abb3de9fd5

Change-Id: I49d0334055b880643f6dd4f85fa6ed9904aaba6f