Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I9b7ade431e81fc0818b792a51cdb1e85da5cb646