Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: e2e-tests: Replace value of 1 with reused constant Upgrade bazlets to latest stable-2.16 Change-Id: I330547e193da696bb4752cc273c0a1509526b1fe