Merge "Fix boot time BatteryStats reset failure" into sc-dev