Merge "Fix test failure due to wrong runtime arguments."
am: 01d5cced1d

* commit '01d5cced1d70ab20bc43354d920ed4264e8fb456':
  Fix test failure due to wrong runtime arguments.