Merge "Add config for the new device management role"