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

Change-Id: I413215e3fca380ee28e91e3690554128d1191388