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