Merge "Adjust virtlet-ds"