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

Change-Id: I3b0a7055a2cd785a21261a37d85e59dbbe6dca8d