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

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