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

Change-Id: Ieaa3e4a4ba06f9786357e0b78f097315e12910b6