Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd am: 4911e517ab
am: c662c1541b

Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632