Merge "Label /dev/hvcN paths"