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

Change-Id: Ic325dd6b8caef5dd1971c341e8d6b2b27cfab2b2