Merge "Add battery power use reporting to batterystats service."