Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 6c207a7d96 am: 83c87d4985 am: 3977570f9f
am: 94b74589f8

Change-Id: Icc93e0e83e6608f1ce064d40df8bd863f9cde0a6