cherry-pick-7df613367a.patch
