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