Merge changes from topic "revert-10501254-multihal_2_1-FNHFKNQMKB" into rvc-dev am: 7a63ec7734

Change-Id: I61aadbe9c83f7428f63bd2285fc58d17d1a001cd