Merge "spm: Normalize the style of spm core manifest" into integration