Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade bazlets to latest stable-2.16 Change-Id: Ia2e30caad6b16ea5afe024433689ace76f00b587