Merge "Add missing lock discovered by GuardedBy checker."
am: a2ee440

* commit 'a2ee44082c21014d3be1163ca362a556b5db30cc':
  Add missing lock discovered by GuardedBy checker.