Merge "[REFACTOR] health 2.0: battery monitor returns health info 2.0"
am: d57bd9622a

Change-Id: I216baf728c401aacb9beeb762df36fc08670d41d