cherry-pick-248acd90d9a3.patch
