cherry-pick-7c11e1188705.patch
