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

Change-Id: Ifb75ad0edfc23ddab115ed42f3e3da2c57d8d392