Merge "Allow traced_probes to access battery coulomb counters" am: 647d9163d6 am: 5fe46b469e
am: d67776ca7c

Change-Id: I1055e4cc748d21a5366404a3715a58ff4ee7e191