Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 6c207a7d am: 83c87d49 am: 3977570f am: 94b74589 Change-Id: Icc93e0e83e6608f1ce064d40df8bd863f9cde0a6