diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml
index 1bb351a5760..8755ccb4d05 100644
--- a/res/drawable/ic_eject_24dp.xml
+++ b/res/drawable/ic_eject_24dp.xml
@@ -17,7 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 0734c0b66ad..6294ab90a14 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -130,7 +130,6 @@ public class StorageVolumePreference extends Preference {
     public void onBindViewHolder(PreferenceViewHolder view) {
         final ImageView unmount = (ImageView) view.findViewById(R.id.unmount);
         if (unmount != null) {
-            unmount.setImageTintList(ColorStateList.valueOf(Color.parseColor("#8a000000")));
             unmount.setOnClickListener(mUnmountListener);
         }
 
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 2698bf4c03a..981f927ee09 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -136,6 +136,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
 
         final Context context = getActivity();
         mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
+        mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
         mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
         mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
         mWifiP2pChannel = mWifiP2pManager.initialize(context, Looper.getMainLooper(), null);
@@ -798,6 +799,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
             mContext = context;
             mSummaryLoader = summaryLoader;
             mRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
+            mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
         }
 
         @Override
diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
index 4bc43391fdd..328c7bc35c7 100644
--- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml
+++ b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
@@ -1,5 +1,6 @@
 com.android.settings.testutils.FakeToggleController
 com.android.settings.testutils.FakeSliderController
+com.android.settings.testutils.FakeInvalidSliderController
 com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
 com.android.settings.accessibility.AccessibilitySlicePreferenceController
 com.android.settings.network.telephony.MmsMessagePreferenceController