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

Change-Id: I6944358213fdae8afc9b5f72e3aedfa3cc3fc329