cherry-pick-9591642a0896.patch
