cherry-pick-eec3ea5dd949.patch
