Merge "Removed old settings device credential logic."