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

Change-Id: I7e893c4bbabd815ef345333e87b31bd0d9f4fc33