Merge "Merge "Fix errorprone warnings that should be errors" am: 403215474e" into main-16k