am 4cbcc2bc: Merge "Bug 5218421: new NPE is SpellChecker when using Japanese language"

* commit '4cbcc2bc06cb228c2c5374920d2d4038685de8a6':
  Bug 5218421: new NPE is SpellChecker when using Japanese language