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