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