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

Change-Id: Ifede49e8e3fa744fa9fb15d8b86cab1aa1564b42