Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade bazlets to latest stable-2.15 Change-Id: I846ed016546edef9fe65c5f33e222698a82a924b