Merge branch 'stable-3.1'

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

Change-Id: I2e0577cb2b7cbf76e4e529ec074f260754abc769