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

Change-Id: I72c03782c82ff40cef7c520adc6d694b52289951