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