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

Change-Id: Icfefa7c805e030b2ca2a367c1e0f03885135ce1b