Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff
-s ours am: e46ed6b7c5
-s ours
am: b358605a3e
-s ours
Change-Id: I7a77106d958e23bf3c610e5a58adb0cfe40ba718
This commit is contained in: