google-java-format was not run after squashing string concatenations in change I7348413ae. Change-Id: I30afb262cca64e7638657d59ebb81938c22f0242