Merge "Fix an errorprone for GuardedBy warning"