Merge "Add missing @GuardedBy("mLock") in MR2ServiceImpl" into main