Closing this as WONTFIX. We aren't getting any explicit customer requests to backport this and it's nontrivial to handle the merge conflict. Given the transient nature of this problem, there are simple enough workarounds.