Merge "Fix duplicate package name output."