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

Change-Id: Idb03bbb758801ed713c15cefe2319193a1785d13