Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I497a88c25811398a169a7f7373a3db65ef66a97c