Merge "Add error code for app adding invalid suggestions"