Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: Ie8f971a6e2f2e8aa8ffd41bf19b360892bfa4448