am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1

* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan