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

Change-Id: I0ee053f749522bdd4e3a29a9a30da396388faf6f