Merge "Allow 'vdc' to be invoked with logwrapper."