Make cosmetic changes as part of Mips internal post commit review of
patch r196331.