Merge branch 'stable-2.15' * stable-2.15: Reformat all code with Google Java Format Eclipse warning: simplify else block Change-Id: Iecce9bb9dd3a2a9e49e210f2309c3d9072637f88