Merge "Fixed EmulatedUserHal merge issues." into rvc-qpr-dev