cherry-pick-de61454cf815.patch
