Merge "[REFACTOR] health 2.0: battery monitor returns health info 2.0" am: d57bd9622a am: f8a81c4e15 am: 321b0bfe9f
am: e287822c42

Change-Id: I9cd5bd0685277b38a28855607bbffa5ff87f5ef2