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

Change-Id: Ief59059b6b56e193097fdb511f9617678034ed86