Merge "Correct AdditionPerfTest to return void."