Merge "Add battery events to primes."
am: 4b6b71fa69

Change-Id: I0d8a0e7792cd0abbd46b5c1296240458ab306aed