Merge "Removing block device by-num symlinks"