Merge "Revert "Handle multiple isolated uid to host uid mapping""