Merge "Fix NullPointerException when getCurrentSuggestions." am: b17f4ddf67
am: fade574422

Change-Id: I90e8622ed57043b8f6fff7bd058cdd973982948e