Merge "Pass all scans to battery stats"
am: b0c32d352b  -s ours

Change-Id: I5669eeb7360e8cfbac3c1d5658cbc41d3ff331db