Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I17c72e58aa4fd2bae92dd425f3099cf0f5a0ae98