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

Change-Id: I8774a4736c29cc8c0433776db40135ceb86ac8f8