Merge "Convert verity tools to subprocess"