Merge "Add an original-package tag that matches the real package name."