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