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