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

Change-Id: I867f3e9ef3db8e7b0376e2250fc3a3d1bf565288