Merge "Update google-java-format-diff" into main