Merge changes from topic "multihal_2_1" into rvc-dev am: 89b216690c

Change-Id: I3d5bc424d10777f37fb66b6023f4d822afcfea7a