Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ic519e4537926b65329d1d81d213ea4789dbbd6c9