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

Change-Id: Ibd4d9bba35a8897ba6679ebe1eeecd9502ac517f