Merge "Fix test failure due to wrong runtime arguments." am: 01d5cced1d am: 258db69d63
am: 1d8204888c

* commit '1d8204888cddfc924fef9f4fb538bf39ddf5c25e':
  Fix test failure due to wrong runtime arguments.