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

Change-Id: Ia02abe3a453da94b8a1541543e7f6a925eee5266