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