Support changes to SuggestionParser

Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
2 files changed