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