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

Change-Id: Ia5acc8ee84b878f88e2265ec8a18d546f12f4d2c