am 8bc972a5: am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1

* commit '8bc972a5a4c3e24d1b9ba9b1dd4b4e2bbb5dadac':
  Clean up the spell checker framework