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