Merge "Fix NullPointerException when getCurrentSuggestions."
am: b17f4ddf67

Change-Id: Iad3f82bdf06467872390a9c9f4d6e616dce90071