Merge cherrypicks of [12526842] into studio-4.1-release

Change-Id: Iaff18dac0847676ab712261ee5f71588d55fc7e4
diff --git a/test-recorder/src/com/google/gct/testrecorder/ui/TestRecorderScreenshotTask.java b/test-recorder/src/com/google/gct/testrecorder/ui/TestRecorderScreenshotTask.java
index a7b4c2d..39744ef 100644
--- a/test-recorder/src/com/google/gct/testrecorder/ui/TestRecorderScreenshotTask.java
+++ b/test-recorder/src/com/google/gct/testrecorder/ui/TestRecorderScreenshotTask.java
@@ -73,7 +73,7 @@
       return;
     }
     indicator.setText("Dumping UI hierarchy on the device...");
-    String uiHierarchyRemoteContainerPath = String.format("/sdcard/Android/data/%s/files/testrecorder", myPackageName);
+    String uiHierarchyRemoteContainerPath = String.format("/sdcard/%s/files/testrecorder", myPackageName);
     String uiHierarchyRemotePath = uiHierarchyRemoteContainerPath + "/ui_hierarchy.xml";
     try {
       myDevice.executeShellCommand("mkdir -p " + uiHierarchyRemoteContainerPath, new CollectingOutputReceiver(), 3, TimeUnit.SECONDS);