Merge "Convert DeviceManager to use CLog."