Reorder for SuperOSR

Change-Id: I2219e1b5781d6a7b7646b35711da83c73114faf0