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

Change-Id: I955bc91b50e7551eebfd2210482502ef1b080315