Merge "Use uint_32 for UidOwnerMatchType" into main