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