Merge changes from topic "health2-hal" am: 116fb89f70 am: a8ed405b9d
am: 0034240afd

Change-Id: I9c414745d25384738247bfc1d1ea403612cd3461