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

Change-Id: Ia13886f7e3214e355db017b4463a956c0971b021