Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ie7e2933381eb24048124924b0eea73f7fe70cdd4