Merge "Grab lock when accessing mutable state" into nyc-mr1-dev am: 6642c963d9
am: decad179f6

Change-Id: Ie4c013991ea3a57009926973441adcbeec38d56f