diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index aecb6f1..a387813 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -30,9 +30,9 @@
         android:title="@string/battery_power_management">
 
         <com.android.settings.widget.MasterSwitchPreference
+            android:fragment="com.android.settings.fuelgauge.BatterySaverSettings"
             android:key="battery_saver"
-            android:title="@string/battery_saver"
-            android:fragment="com.android.settings.fuelgauge.BatterySaverSettings"/>
+            android:title="@string/battery_saver"/>
 
         <SwitchPreference
             android:key="battery_percentage"
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index b82c28d..779a8aa 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -63,7 +63,7 @@
 
     @Override
     public void dismissSuggestion(Context context, SuggestionParser parser, Tile suggestion) {
-        if (parser == null || suggestion == null) {
+        if (parser == null || suggestion == null || context == null) {
             return;
         }
         mMetricsFeatureProvider.action(
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index b36aef2..3efe15a 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -120,6 +120,14 @@
         verify(mContext, never()).getPackageManager();
     }
 
+
+    @Test
+    public void dismissSuggestion_noContext_shouldDoNothing() {
+        mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
+
+        verifyZeroInteractions(mFactory.metricsFeatureProvider);
+    }
+
     @Test
     public void dismissSuggestion_hasNoMoreDismissCount_shouldDisableComponent() {
         when(mSuggestionParser.dismissSuggestion(any(Tile.class), anyBoolean()))