Merge "Add low power stats to batteryhistory" into nyc-dev