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

Change-Id: Ic95046c31867bcda12ab27c0870907fb0109afab