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

Change-Id: I31abf757301865ca2cb182829f32caef5a19b551