Merge "Need to keep new package's cert when using original-package."