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

* commit '00f24284fd4bd12a7fc1865da4984dd6a7c71a94':
  Test fails on mips.