Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I2cf5df394af5b52a96f04ad529343c560f1698ef