Merge "Revert "RESTRICT AUTOMERGE: Revert "Added artd to the UID map""" into sc-dev