Merge "Update UID routing to upstream implementation."