Merge changes from topic "multihal_2_1" into rvc-dev am: 89b216690c am: f3660d09f7

Change-Id: I596bcbc3ac680251e031297fd504785e21a98278