Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I4f7d47d1db2b8168e7fea9c950c7b82ff86f05e5