Merge "Clean up setTestResultAndFinish" into lmp-dev