Merge "Move UidRange to connectivity"