To include https://github.com/bazelbuild/bazel/commit/48f081f6f18277d4bbbb5a1740f9c59cecdf88fc in 6.4