Merge \\"Fixed race condition by using a separate counter\\" into nyc-mr1-dev am: d2e8ae4a90
am: a0e3d607c2

Change-Id: I4ba38ea91cf6f3b867b886bf97d9f4e6287aab6b