Merge "Set pkg name in some "leaf" CTS Manifests."