Merge "vbash: move vbash from services/device to cmd"