Merge "BatteryStatsManager: Address API council feedback"