Merge "Add missing lock discovered by GuardedBy checker."