am 64dc128f: am 50246792: Merge "Run-test fix."

* commit '64dc128fb90f39732c6fb1e1b38589c4f152bcc3':
  Run-test fix.