Merge "Remove @GuardedBy on a final, immutable field" into sc-dev