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

Change-Id: Ida6aea08decef64d6e0fadedbcd9e750fd89f3c4