Merge "BatteryStats: Cleanup external stats collection"