Merge "Simplify patch by not passing cargo_pkg_version."