Submitted on behalf of Vetri for Review Request 23008
(cherry picked from commit 9c2e6f5ed45522ff68131556028f3fb4ff91ee90)