am 9e8eb993: (-s ours) am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."

* commit '9e8eb9930b39638f7a7fff6b02a86906430cb76f':