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

* commit '9f06e429edf34e6add26a45d9b9ace20d44e0a8c':
  Fix SpareParts crash going into battery stats.