Merge "Cherry-pick crrev/c/5233108" into main