Merge "Fix manifest reference to renamed string."