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

Change-Id: Ib75da8118af0cef7bd06a9a88478529b64cd328d