cherry-pick-886e42fda116.patch
