Merge "Don't allow a zero-length device name to work." into pi-dev