Merge "Remove unnecessary converting us to ms in BatteryInfo"