Merge "Fix run-test"
am: 51333f93a8

* commit '51333f93a827a36ed179d44f076d36dd629a7fe8':
  Fix run-test