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

Change-Id: I162c20774af6549516550a5a1f45a9c53a37d5ea