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