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