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

* commit '258db69d6355b1cdd3635df5b55b5904db5a1392':
  Fix test failure due to wrong runtime arguments.