Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1a02f9717383295dbe1d02f4403f4e877f41e930