[release-0.4] Fix remove redundant component label added for backward compatibility with upgrade tests

[release-0.4] Fix remove redundant component label added for backward compatibility with upgrade tests #1585