Merge "refactor devicemanager-core"