am 0defe0d5: am 00f24284: Merge "Test fails on mips."

* commit '0defe0d5251d1f950acdca8b554747adb42d0970':
  Test fails on mips.