Merge "incidentd: Removing history from batterystats dump."