Merge "Fix typos for manifest dtd"