Merge "Fix test failure due to wrong runtime arguments."