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

Change-Id: Iaf211b338d946619ec6a5daecd02ee85a4648589