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

Change-Id: Ibe00e1f3bdf916129355a38beece5378ec379a78