Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API Change-Id: I1850131928a56baf913e2ab1c8163b5daef6389b