Merge "Update adapter-manager devicemanager"