Merge "Tweak APIs for SpellChecker"