Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I4f6ab465a603f882b2f088d8ac839bf50cc634ed