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