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

Change-Id: I20cfa13d71bfd4fbeea2c6c3b4975fc64f4c80d5