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

Change-Id: Ibfc74ad7fbe276b75c8e679a0cdd7a8864d6d0e2