patches: Update with latest changes

Change-Id: I6cc2d1c2c15ef6fd271d08641c98f7da99399386