Merge "Add missing final and @GuardedBy"