Merge "New Devicemanager for NTSIM Functionality"