Bug 914362 - fix long device name problem