Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
(cherry picked from commit 6e030ca313)
6e030ca313