Merge "RESTRICT AUTOMERGE Protect against possible race conditions" into nyc-dev am: d1c3cd5c2a am: c36f61370c am: abb3de9fd5 am: 8dc34ebd0b am: 29e2a05752  -s ours
am: 07a08ec89b

Change-Id: If886f85554ace80b4678ab98e9f92126fd90feb0