Merge "Remove DeviceProfilesSettings"