Merge "Fix ManifestMerger issues"