Merge "Add tests for mapIsolatedUidToHostUid methods" into rvc-dev