Merge "Remove obsolete uni drc precedence handling"