diff --git a/Android.mk b/Android.mk
index 3fb1b4271..b2dad7af9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,7 +49,7 @@ LOCAL_OVERRIDES_PACKAGES := Email
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
 
-LOCAL_SDK_VERSION := 16
+LOCAL_SDK_VERSION := current # TODO change this to "17" once the MR1 sdk version is set to 17
 
 include $(BUILD_PACKAGE)
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e57f323ee..e51618c90 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,7 +40,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <!-- This needs to be present when we are doing unbundled releases. -->
-    <uses-sdk android:targetSdkVersion="16" android:minSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="14" />
 
     <original-package android:name="com.android.email" />