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