Merge "batterymonitor: simplify readFromFile and use std::string buffers"