am 8210866b: am 6bec6cb7: Merge "Fix quick mode bugs for Mips."

* commit '8210866beb2f516555c3f0b17465c8618c7dabdd':
  Fix quick mode bugs for Mips.