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