Pending https://github.com/bazelbuild/bazel/pull/16372

Closes #16809.

PiperOrigin-RevId: 492981010
Change-Id: I7430049131730ad48bff1e8c59c45e11bc4488cb