cherry-pick-7783104.patch
