Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I7bcc009cbe16925d74962674489d3b1afc364e57