diff --git a/res/layout/edit_date_picker.xml b/res/layout/edit_date_picker.xml
index ce9a85f..e2c4278 100644
--- a/res/layout/edit_date_picker.xml
+++ b/res/layout/edit_date_picker.xml
@@ -30,5 +30,5 @@
     android:layout_marginStart="@dimen/editor_field_left_padding"
     android:layout_marginEnd="@dimen/editor_field_right_padding"
     android:textAppearance="?android:attr/textAppearanceMedium"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip" />
+    android:paddingStart="12dip"
+    android:paddingEnd="@dimen/editor_spinner_end_padding_workaround" />
diff --git a/res/layout/item_group_membership.xml b/res/layout/item_group_membership.xml
index 7f58c2d..fa447bb 100644
--- a/res/layout/item_group_membership.xml
+++ b/res/layout/item_group_membership.xml
@@ -37,7 +37,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="start|center_vertical"
         android:focusable="true"
-        android:paddingLeft="12dip"
-        android:paddingStart="12dip" />
+        android:paddingStart="12dip"
+        android:paddingEnd="@dimen/editor_spinner_end_padding_workaround"/>
 
 </com.android.contacts.editor.GroupMembershipView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0a5403b..52918d5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -47,6 +47,13 @@
     <!-- Left padding of a field in the Editor -->
     <dimen name="editor_field_left_padding">4dip</dimen>
 
+    <!-- End padding added to spinners in the editor. This separates the spinner text from the
+        spinner graphic when Button gravity is incorrectly set in RTL mode
+        (see framework bug b/17011078. In LTR mode this shouldn't have an observable affect.
+        We set paddingEnd instead of drawablePadding since the spinner graphic is not a normal
+        drawable.  -->
+    <dimen name="editor_spinner_end_padding_workaround">24dip</dimen>
+
     <!-- Width of the Type-Label in the Editor -->
     <dimen name="editor_type_label_width">100dip</dimen>