cherry-pick-a48de319c521.patch
