Merge "New ITestDevice Apis."