Handle device name length Gerrit comment