Merge branch 'stable-3.1'

* stable-3.1:
  Format files with google-java-format

Change-Id: I5617d4ebf7b283a334a77c79fdb7379dd1e87896