Merge "Fix profile owners uid logic" into udc-dev