Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev am: bd16255ee1
am: 698862f60d

Change-Id: Ibe7321cb8ce937e43ec10696ad6f6a8d54b77657