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