v2.16.12
Merge branch 'stable-2.15' * stable-2.15: Format with google-java-format 1.7 Change-Id: Id8d61153874989dcad7e0b2deeaaf191ff2e183e