diff --git a/Android.mk b/Android.mk
index be1d7198c..6ca4633f9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,8 +15,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := eng development
-
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := Email
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b749dd018..de4f706a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -181,6 +181,13 @@
Message discarded.
Message saved as draft.
+
+ Add Contact
+
+ Add \"%s\" to contacts
+
+
Set up email
diff --git a/tests/src/com/android/email/activity/MessageViewTests.java b/tests/src/com/android/email/activity/MessageViewTests.java
index 393eaf420..64b42d679 100644
--- a/tests/src/com/android/email/activity/MessageViewTests.java
+++ b/tests/src/com/android/email/activity/MessageViewTests.java
@@ -26,6 +26,7 @@ import android.content.Context;
import android.content.Intent;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
import android.view.MenuItem;
import android.webkit.WebView;
import android.widget.TextView;
@@ -112,6 +113,7 @@ public class MessageViewTests
* Tests that various UI calls can be made safely even before the messaging controller
* has completed loading the message. This catches various race conditions.
*/
+ @Suppress
public void testUiRaceConditions() {
MessageView a = getActivity();