Merge "Ignore user portion when checking for system uid"