Merge "Resolve UidRange dependency between NMS and CS module"