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

Change-Id: I88b35ddd8e0ef464459f880a8900ffa328e73c0c