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

Change-Id: I0568705bc093fda891c5b94f3c617b656f4ef228