Merge "Fix the manifest when requiredSplitTypes presents"