Created by: varungandhi-src
2 commits stacked on top of #31143.
n/a as it doesn't affect application code.