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 am: 8577216c08 am: 408fae922f
am: 04185ea9a3  -s ours

Change-Id: I94280fc07f49e558ca89b37ddfc4c483addc21d8