Merge branch 'stable-2.15' * stable-2.15: Format all Java files with google-java-format 1.6 Change-Id: Id830ae17cd4669f150d92ec16218e25ebc4807c5