[TASK] Process remap handling earlier

Change-Id: I9dc77630e832e2b9ab65840daf44931640c6d816