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