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

Change-Id: Ic0bfa7ac6e5237bb1e69c8f056a5730249abb766