Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am: fef5f6aa4a
am: b5989fc3b7

Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b