Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Update bazlets to latest revision on stable-2.15 Change-Id: Ica062ba1cfa06ba7776e34295da27c390fc5a002