Cherry-picks one of the commits adding test coverage from #13062. As pointed out by aj:
could move the test additions to the first commit, since they're testing things that are already true
Pull the additional test code into master earlier.
Cherry-picks one of the commits adding test coverage from #13062. As pointed out by aj:
could move the test additions to the first commit, since they're testing things that are already true
Pull the additional test code into master earlier.
Code review ACK 34d0e07e929c9dd12727d77896cc47f7ac4be680