Grab lock when accessing mutable state am: 442ed57e4b am: e1790d928f
am: b8e820a2a8

Change-Id: I01e8027dde6568d3044aad03688d98c4e4789696