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

* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
  Prevent NPE in SuggestionSpan