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

Change-Id: I1c3f23c038d296ea4438a6dd91aa1e2871c5e411