Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bump Bazel version to 2.2.0

Change-Id: I82d2538eab53cd4f4887a51773f14b3f78cc57f5