Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Change-Id: I19cc87dfa3186a910f0a92e94c4d1067fd4a18c2