Merge "Remove BatteryStats ref from BackupRecord"