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