Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I84dcf3e50c2b099ede1698b93d28eb6fb42f21b1