(cherry picked from commit 745553c6)
The problem came up in !2401 (closed). This backport should fix this problem for the release branch.
(cherry picked from commit 745553c6)
The problem came up in !2401 (closed). This backport should fix this problem for the release branch.