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