Let's try this again, now with both commits needed for a fix (that doesn't result in a test failure). /cherry-pick 86a60e7f1e8f361f84ccb6e656e848dd4fbaa713 /cherry-pick a3816b5a573dbf57ba3082a919ca2de6b47257e9