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

Change-Id: I53e8394865060bc479b677a4e9a2fedcade3f153