Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am: 6c207a7d96

Change-Id: I82f59649db71b255abdbafae8190f40974534f83