Merge "Fix more locking issues identified by @GuardedBy."