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