Merge "System UserInfo flags are set in UserTypeFactory" into udc-dev