Merge "runtest: Fix mmm equivalent" am: 0ba0482cc5
am: 7d5963c0af

Change-Id: I855fc8561ed8442adefb1dab439ab34579d62f56