Merge "Remove obsolete and unused PATCHOAT_FOR_RELOCATION." am: 804b145356 am: 55cfd8607f
am: 766381b582

Change-Id: Ia46753ab12f575ddff835b5aee30fa25fa0f3619