Merge "Update google-java-format to 1.2-SNAPSHOT." am: e0a04446d8 am: b6c12309e4
am: 49b0572a4d

Change-Id: I7b5a4471e2bda8576ff1677f47b9bb6c8806e714