cherry-pick-e89fe66d0473.patch
