tree 1bae12d41a57a4df7882e818051f23c4a5a5601f
parent 68c7e5a3c679be51f750d44aae146007f0f04b4d
author nharmata <nharmata@google.com> 1550598770 -0800
committer Copybara-Service <copybara-worker@google.com> 1550598883 -0800

Logical rollforward of https://github.com/bazelbuild/bazel/commit/e2e235359ccdc4b6a122586b9d7c99abbddd65f5. That commit was reverted because it tickled an unrelated bug accidentally exercised by a Google-internal test.

The unrelated bug has been fixed separately.

RELNOTES: None
PiperOrigin-RevId: 234620238