Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Id4510637f3f23014920d5460357d71ad8b8fb7c6