Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16

Change-Id: Ic5d3829c434e60b52f50966d4acbc6fd12791f99