Merge branch 'stable-3.2'

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

Change-Id: I1c3010a8d478703c8285c73be4b092add5402b22