Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ifb680c49fc3f453ce9956312439ab3dc3dcc4a40