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

Change-Id: I2a378d638caab7fdcffd81c241ab935bc91403f7