Merge "Silence a compiler warning due to unused variable on mips"