Merge "BatteryMonitor: report current_now in uA"