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

Change-Id: Iac2de05d7af957ef092f7aa41f568641ca31823e