Merge "Fix NPE when building suggestion identifier."