Patches to back port: - [x] https://github.com/bazel-contrib/rules_python/pull/3538
Patches to back port: