Merge "health@2.0: IHealthInfoCallback expands HealthInfo struct." am: f2f00cb742 am: 4b29ecf7c1
am: aaf2e923d1

Change-Id: I322d16b11fe5618b7e067cddedebb690873ea460