Merge "Fix Test Harness Mode to work with new ADB file"