cherry-pick-6763a713f957.patch
