Merge "Add subtypeId for SpellCheckerSubtype."