Merge "Prevent NPE in SuggestionSpan" into ics-mr1