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

Change-Id: I37c0f4c88d9ee5ebc1ca647e86d98af60bc5b96f