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

Change-Id: I0994ff9c8ec72b807d1a9f53fa339f0dd4149bb9