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

Change-Id: Ica5d8275115742a5a106791193c844cc7da22bc6