Merge "Grab lock when accessing mutable state" into nyc-mr1-dev