Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: Idfb30c6cc7fdef0cb5d469a061633c890c6b0cf1