Merge "Update voip in classpath"