Merge "health@2.0: IHealthInfoCallback expands HealthInfo struct." am: f2f00cb742 am: 4b29ecf7c1 am: aaf2e923d1
am: 4991b21bfc  -s ours

Change-Id: Id2965499640f1a6fa657d00266365c7e4c1f7541