Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I24e978747ac5c1b592dc723c5efd28ec5747995a