Merge "Add time estimates to batterystats dump." into lmp-mr1-dev