Merge "Add x-ran devicemanager"