Merge "[BatteryStats] Correct formatter for pkginst in battery stats."