Merge "Initial integration of BatteryUsageStats into PowerStatsViewer"