Merge \"Fix data race\" into nyc-dev
am: 838dfe60f0

Change-Id: I4aa6d76b855bcbb9d570ddcfcf8f8c61c135930d