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