Merge "Fix typo in GuardedBy annotation."