diff --git a/api/current.txt b/api/current.txt
index 5778c7e4778f0..1cb0c8f8fe1e1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2558,6 +2558,7 @@ package android {
     field public static final int Widget_Material_Light_SeekBar = 16974534; // 0x10302c6
     field public static final int Widget_Material_Light_SegmentedButton = 16974535; // 0x10302c7
     field public static final int Widget_Material_Light_Spinner = 16974537; // 0x10302c9
+    field public static final int Widget_Material_Light_Spinner_Form = 16974567; // 0x10302e7
     field public static final int Widget_Material_Light_StackView = 16974536; // 0x10302c8
     field public static final int Widget_Material_Light_Tab = 16974538; // 0x10302ca
     field public static final int Widget_Material_Light_TabWidget = 16974539; // 0x10302cb
@@ -2584,6 +2585,7 @@ package android {
     field public static final int Widget_Material_SeekBar = 16974471; // 0x1030287
     field public static final int Widget_Material_SegmentedButton = 16974472; // 0x1030288
     field public static final int Widget_Material_Spinner = 16974474; // 0x103028a
+    field public static final int Widget_Material_Spinner_Form = 16974566; // 0x10302e6
     field public static final int Widget_Material_StackView = 16974473; // 0x1030289
     field public static final int Widget_Material_Tab = 16974475; // 0x103028b
     field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c
diff --git a/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..8af9ceb4bacff
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_textfield_activated_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..81c78c66ac41d
Binary files /dev/null and b/core/res/res/drawable-hdpi/spinner_textfield_default_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..22992c047c982
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_textfield_activated_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..f44a2c252deb7
Binary files /dev/null and b/core/res/res/drawable-mdpi/spinner_textfield_default_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..2d79d596cb293
Binary files /dev/null and b/core/res/res/drawable-xhdpi/spinner_textfield_activated_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..36f975390ef57
Binary files /dev/null and b/core/res/res/drawable-xhdpi/spinner_textfield_default_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..9c0b19e0674f1
Binary files /dev/null and b/core/res/res/drawable-xxhdpi/spinner_textfield_activated_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..0edb4b8ceaa68
Binary files /dev/null and b/core/res/res/drawable-xxhdpi/spinner_textfield_default_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..78c5ebd597e81
Binary files /dev/null and b/core/res/res/drawable-xxxhdpi/spinner_textfield_activated_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000000000..36974b7c15083
Binary files /dev/null and b/core/res/res/drawable-xxxhdpi/spinner_textfield_default_mtrl_alpha.9.png differ
diff --git a/core/res/res/drawable/spinner_textfield_background_material.xml b/core/res/res/drawable/spinner_textfield_background_material.xml
new file mode 100644
index 0000000000000..f818baf130892
--- /dev/null
+++ b/core/res/res/drawable/spinner_textfield_background_material.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
+    <item android:state_checked="true">
+        <nine-patch android:src="@drawable/spinner_textfield_activated_mtrl_alpha"
+            android:tint="?attr/colorControlActivated" />
+    </item>
+    <item android:state_pressed="true">
+        <nine-patch android:src="@drawable/spinner_textfield_activated_mtrl_alpha"
+            android:tint="?attr/colorControlActivated" />
+    </item>
+    <item>
+        <nine-patch android:src="@drawable/spinner_textfield_default_mtrl_alpha"
+            android:tint="?attr/colorControlNormal" />
+    </item>
+</selector>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e894a9cb47e9d..c8edad045be38 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2518,6 +2518,19 @@
   <public type="style" name="Widget.Material.Button.Borderless.Colored" />
   <public type="style" name="Widget.Material.Light.Button.Borderless.Colored" />
 
+  <public type="style" name="Theme.Leanback.FormWizard"/>
+
+  <public type="style" name="TextAppearance.StatusBar.Material" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Title" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Line2" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Info" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
+  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
+
+  <public type="style" name="Widget.Material.Spinner.Form" />
+  <public type="style" name="Widget.Material.Light.Spinner.Form" />
+
   <public-padding type="string" name="l_resource_pad" end="0x01040030" />
 
   <public type="string" name="config_webSettingsDefaultTextEncoding" />
@@ -2528,8 +2541,6 @@
 
   <public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />
 
-  <public type="style" name="Theme.Leanback.FormWizard"/>
-
   <!-- An interpolator which accelerates fast but decelerates slowly. -->
   <public type="interpolator" name="fast_out_slow_in" />
   <!-- An interpolator which starts with a peak non-zero velocity and decelerates slowly. -->
@@ -2564,23 +2575,4 @@
   <public type="raw" name="loaderror" id="0x01100000"/>
   <!-- WebView error page for when domain lookup fails. @hide @SystemApi -->
   <public type="raw" name="nodomain"/>
-
-  <!-- Base text appearance for SystemUI elements -->
-  <public type="style" name="TextAppearance.StatusBar.Material" />
-  <!-- Base text appearance for notifications -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent" />
-  <!-- Notification text appearance: title -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Title" />
-  <!-- Notification text appearance: additional line of text sandwiched
-       between the title and content -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Line2" />
-  <!-- Notification text appearance: an annotation, e.g. the
-       number of messages in your inbox -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Info" />
-  <!-- Notification text appearance: timestamp -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
-  <!-- Notification text appearance: a way to highlight a bit of text (for
-       example, to separate the sender from the subject of an email if they
-       are all on the same line) -->
-  <public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
 </resources>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index eea81977ff150..f9aa43e1bc6a7 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -727,6 +727,10 @@ please see styles_device_defaults.xml.
         <item name="overlapAnchor">true</item>
     </style>
 
+    <style name="Widget.Material.Spinner.Form">
+        <item name="background">@drawable/spinner_textfield_background_material</item>
+    </style>
+
     <style name="Widget.Material.TabWidget" parent="Widget.TabWidget">
         <item name="tabStripLeft">@null</item>
         <item name="tabStripRight">@null</item>
@@ -976,6 +980,7 @@ please see styles_device_defaults.xml.
     <style name="Widget.Material.Light.Spinner" parent="Widget.Material.Spinner" />
     <style name="Widget.Material.Light.Spinner.DropDown" parent="Widget.Material.Spinner.DropDown"/>
     <style name="Widget.Material.Light.Spinner.DropDown.ActionBar" parent="Widget.Material.Spinner.DropDown.ActionBar"/>
+    <style name="Widget.Material.Light.Spinner.Form" parent="Widget.Material.Spinner.Form" />
     <style name="Widget.Material.Light.TabWidget" parent="Widget.Material.TabWidget"/>
     <style name="Widget.Material.Light.WebTextView" parent="Widget.Material.WebTextView"/>
     <style name="Widget.Material.Light.WebView" parent="Widget.Material.WebView"/>