Merge branch 'stable-2.16'

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

Change-Id: I95f59c23338cd452d1e8f0aca5faadeec5a5c6dc