Make the patch apply

Change-Id: Ic773b86a1ebaa66a1b0ae236429276f35776deb8