Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: I0d9fa6722b78a1c8257e655cbcccfe4bec8aefb4