Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f am: 5c5637e1 am: 4911e517 am: c662c154 Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632