diff --git a/res/layout/battery_chart_graph.xml b/res/layout/battery_chart_graph.xml
index 18e650ce1d4..1896b78d016 100644
--- a/res/layout/battery_chart_graph.xml
+++ b/res/layout/battery_chart_graph.xml
@@ -36,6 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="165dp"
         android:layout_marginBottom="16dp"
+        android:visibility="invisible"
         android:textAppearance="?android:attr/textAppearanceSmall"
         settings:textColor="?android:attr/textColorSecondary" />
     <TextView
diff --git a/res/xml/power_usage_advanced.xml b/res/xml/power_usage_advanced.xml
index fb142d32405..fc6c0fff883 100644
--- a/res/xml/power_usage_advanced.xml
+++ b/res/xml/power_usage_advanced.xml
@@ -25,8 +25,7 @@
         android:key="battery_graph"/>
 
     <PreferenceCategory
-        android:key="app_list"
-        android:title="@string/power_usage_list_summary"/>
+        android:key="app_list"/>
 
     <com.android.settingslib.widget.FooterPreference
         android:title="@string/battery_usage_screen_footer"
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 707a04b9d8a..891b6d69e2a 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -167,6 +167,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
         super.displayPreference(screen);
         mPrefContext = screen.getContext();
         mAppListGroup = screen.findPreference(mPreferenceKey);
+        mAppListGroup.setTitle(mPrefContext.getString(R.string.power_usage_list_summary));
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java
index e2e7f8f7519..37c298496ed 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartView.java
@@ -157,6 +157,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
         } else {
             mTextPaint = null;
         }
+        setVisibility(View.VISIBLE);
         requestLayout();
     }
 
diff --git a/src/com/android/settings/fuelgauge/ConvertUtils.java b/src/com/android/settings/fuelgauge/ConvertUtils.java
index fc58e501af5..d2f3ab5c71d 100644
--- a/src/com/android/settings/fuelgauge/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/ConvertUtils.java
@@ -214,13 +214,11 @@ public final class ConvertUtils {
                         currentEntry.mBackgroundUsageTimeInMs,
                         nextEntry.mBackgroundUsageTimeInMs,
                         nextTwoEntry.mBackgroundUsageTimeInMs);
-                final double consumePower =
+                double consumePower =
                     getDiffValue(
                         currentEntry.mConsumePower,
                         nextEntry.mConsumePower,
                         nextTwoEntry.mConsumePower);
-                totalConsumePower += consumePower;
-
                 // Excludes entry since we don't have enough data to calculate.
                 if (foregroundUsageTimeInMs == 0
                         && backgroundUsageTimeInMs == 0
@@ -246,7 +244,9 @@ public final class ConvertUtils {
                         Math.round(foregroundUsageTimeInMs * ratio);
                     backgroundUsageTimeInMs =
                         Math.round(backgroundUsageTimeInMs * ratio);
+                    consumePower = consumePower * ratio;
                 }
+                totalConsumePower += consumePower;
                 batteryDiffEntryList.add(
                     new BatteryDiffEntry(
                         context,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
index c4341ef91f3..4d8d6ce9078 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ConvertUtilsTest.java
@@ -286,9 +286,14 @@ public final class ConvertUtilsTest {
         final List<BatteryDiffEntry> entryList = purgedResultMap.get(0);
         assertThat(entryList).hasSize(1);
         // Verifies the clipped usage time.
+        final float ratio = (float) (7200) / (float) (3600 + 7200);
         final BatteryDiffEntry resultEntry = entryList.get(0);
-        assertThat(resultEntry.mForegroundUsageTimeInMs).isEqualTo(2400000);
-        assertThat(resultEntry.mBackgroundUsageTimeInMs).isEqualTo(4800000);
+        assertThat(resultEntry.mForegroundUsageTimeInMs)
+            .isEqualTo(Math.round(entry.mForegroundUsageTimeInMs * ratio));
+        assertThat(resultEntry.mBackgroundUsageTimeInMs)
+            .isEqualTo(Math.round(entry.mBackgroundUsageTimeInMs * ratio));
+        assertThat(resultEntry.mConsumePower)
+            .isEqualTo(entry.mConsumePower * ratio);
     }
 
     @Test