Merge "Support 32 match types in UidOwnerValue rule"