Merge "Deprecate BatteryStatsHelper and BatterySipper" into sc-dev