Merge "Fix SpareParts crash going into battery stats."