cherry-pick-b149a5c62d76.patch
