Merge branch 'stable-3.1'

* stable-3.1:
  e2e-tests: Replace value of 1 with reused constant
  Upgrade bazlets to latest stable-2.16

Change-Id: I6caee5b8142461f89892a9933ea0fadca3030522