Snap for 12722466 from 3cc3c75cd3ba5c5235ee1142c440a8ec68b13a4b to mainline-permission-release

Change-Id: I613e0d4ae5acf68c4e6857f90253956c5b5f6339
diff --git a/harness/src/main/java/com/android/csuite/core/AppCrawlTester.java b/harness/src/main/java/com/android/csuite/core/AppCrawlTester.java
index 0404db9..4d8fa66 100644
--- a/harness/src/main/java/com/android/csuite/core/AppCrawlTester.java
+++ b/harness/src/main/java/com/android/csuite/core/AppCrawlTester.java
@@ -318,6 +318,9 @@
         // Minimum timeout 3 minutes plus crawl test timeout.
         long commandTimeout = 3L * 60 * 1000 + getOptions().getTimeoutSec() * 1000;
 
+        CLog.i(
+                "Starting to crawl the package %s with command %s",
+                mPackageName, String.join(" ", command.get()));
         // TODO(yuexima): When the obb_file option is supported in espresso mode, the timeout need
         // to be extended.
         if (getOptions().isRecordScreen()) {
diff --git a/test_targets/webview-app-launch/plan.xml b/test_targets/webview-app-launch/plan.xml
index 5d3c48f..102612c 100644
--- a/test_targets/webview-app-launch/plan.xml
+++ b/test_targets/webview-app-launch/plan.xml
@@ -1,3 +1,3 @@
 <configuration description="WebView C-Suite Crawler Test Plan">
-  <target_preparer class="com.android.webview.tests.WebviewInstallerToolPreparer"/>
+  <target_preparer class="com.android.webview.lib.WebviewInstallerToolPreparer"/>
 </configuration>