Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I72bbdd5900539262839f07274aa465260589a5c2