am 50246792: Merge "Run-test fix."

* commit '50246792ff37fe25446b70564c0942f04d3e5f48':
  Run-test fix.