Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Id16af3c4724919977b966b8869cbceed4c244f2e