Update patch after rebase against master

Change-Id: Ie8d2f95be93a641b46905c6b8b1da7ca89bad146