cherry-pick-2882e1afd982.patch
