cherry-pick-d7c15613590b.patch
