cherry-pick-f666cceb92c2.patch
