cherry-pick-c5569dc.patch
