Merge "Fix up run-test." am: 9b4571cadc am: 4a7a553a48
am: 1ef4db4a53

* commit '1ef4db4a53f5347268bf8fe031d903d38e86f0f3':
  Fix up run-test.