diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index 8ac41b14c..26dc4a811 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -61,8 +61,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true);
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.rotateAllActivities();
-    EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true,
+        true);
     instrumentation.waitForIdleSync();
     assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
         .getString(R.string.track_list_empty_message)));
@@ -71,9 +71,11 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     assertEquals(0, trackListView.get(0).getCount());
     // Export when there is no track.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
-    EndToEndTestUtils.SOLO
-        .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
-            EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.SOLO.clickOnText(String.format(
+        activityMyTracks.getString(R.string.save_all_selection_option),
+        EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.getButtonOnScreen(
+        EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
     String totalTracks = activityMyTracks.getResources().getQuantityString(R.plurals.tracks, 0, 0);
     String directoryName = FileUtils.buildExternalDirectoryPath(EndToEndTestUtils.GPX);
     String message = activityMyTracks.getString(R.string.save_error, 0, totalTracks, directoryName);
@@ -100,8 +102,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils.SOLO.clickOnView(trackListView.get(0).getChildAt(0));
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
-    EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true,
+        true);
     instrumentation.waitForIdleSync();
     trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
     int trackNumberNew = trackListView.get(0).getCount();
@@ -117,8 +119,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils.checkUnderRecording();
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete), true);
-    EndToEndTestUtils
-        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true,
+        true);
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.checkNotRecording();
   }
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index 6baf96385..40d99334b 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -546,6 +546,8 @@ public class EndToEndTestUtils {
     findMenuItem(activityMytracks.getString(R.string.menu_save), true);
     instrumentation.waitForIdleSync();
     SOLO.clickOnText(trackKind.toUpperCase());
+    EndToEndTestUtils
+    .getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
     SOLO.waitForText(activityMytracks.getString(R.string.generic_success_title));
   }
 
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
index 6b9422f82..3097b2786 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
@@ -88,9 +88,11 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
 
     // Click to export tracks(At least one track) to Gpx files.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
-    EndToEndTestUtils.SOLO
-        .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
-            EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.SOLO.clickOnText(String.format(
+        activityMyTracks.getString(R.string.save_all_selection_option),
+        EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.getButtonOnScreen(
+        EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
     EndToEndTestUtils.SOLO.waitForText(getSaveSuccessMessage(1, EndToEndTestUtils.GPX));
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
@@ -187,9 +189,11 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
 
     // Click to export tracks(At least one track) to Gpx files.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
-    EndToEndTestUtils.SOLO
-        .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
-            EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.SOLO.clickOnText(String.format(
+        activityMyTracks.getString(R.string.save_all_selection_option),
+        EndToEndTestUtils.GPX.toUpperCase()));
+    EndToEndTestUtils.getButtonOnScreen(
+        EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
     EndToEndTestUtils.SOLO.waitForText(getSaveSuccessMessage(1, EndToEndTestUtils.GPX));
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
@@ -228,9 +232,11 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     gpxFilesNumber = EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.GPX).length;
     trackNumber = EndToEndTestUtils.SOLO.getCurrentListViews().get(0).getCount();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
-    EndToEndTestUtils.SOLO
-        .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
-            EndToEndTestUtils.KML.toUpperCase()));
+    EndToEndTestUtils.SOLO.clickOnText(String.format(
+        activityMyTracks.getString(R.string.save_all_selection_option),
+        EndToEndTestUtils.KML.toUpperCase()));
+    EndToEndTestUtils.getButtonOnScreen(
+        EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
     EndToEndTestUtils.SOLO.waitForText(getSaveSuccessMessage(2, EndToEndTestUtils.KM));
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
@@ -250,7 +256,8 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
      * Wait for the prefix of import success string is much faster than wait the
      * whole string.
      */
-    EndToEndTestUtils.waitTextToDisappear(activityMyTracks.getString(R.string.generic_progress_title));
+    EndToEndTestUtils.waitTextToDisappear(activityMyTracks
+        .getString(R.string.generic_progress_title));
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.import_success).split(
         "%")[0]);
 
@@ -298,5 +305,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
   private void importTracks(String fileType) {
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_import_all), true);
     EndToEndTestUtils.SOLO.clickOnText(fileType.toUpperCase());
+    EndToEndTestUtils.getButtonOnScreen(
+        EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
   }
 }
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
index 7c6aa5b79..45f8a37fc 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java
@@ -122,10 +122,19 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     // Click share again and confirm the share.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_yes));
-    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
-        .getString(R.string.share_track_add_emails_title)));
+
+    // If Choose account dialog prompt, choose the first account.
+    if (EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.send_google_choose_account_title), 1,
+        EndToEndTestUtils.SHORT_WAIT_TIME)) {
+      EndToEndTestUtils.SOLO.clickOnText(GoogleUtils.ACCOUNT_NAME_1);
+      EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true,
+          true);
+    }
 
     // Input account to share and click OK button.
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
+        .getString(R.string.share_track_add_emails_title)));
     EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, GoogleUtils.ACCOUNT_NAME_2);
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
@@ -161,7 +170,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_no));
     assertFalse(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.share_track_add_emails_title), 1,
-        EndToEndTestUtils.VERY_SHORT_WAIT_TIME));   
+        EndToEndTestUtils.VERY_SHORT_WAIT_TIME));
 
     // Try all share items.
     for (int i = 0;; i++) {