Also do patch on 9.0

Change-Id: Id41f877306769029812269b6588be5c8c45bfc11