cherry-pick-a0d16d18d072.patch