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

Change-Id: I9133f70b6f10a5117e5dff7e182efaefb08977c5