am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."

* commit '6ecf30f2d8707de4c71272949afc2e6e6818e715':
  Fix SpareParts crash going into battery stats.