Merge "MIPS: HRor clean-up"