cherry-pick-a01bb1dddef8.patch
