Merge "Reland "Support UID/GID mapping.""