Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-dr1-dev am: 689359914d
am: 82388cda78  -s ours

Change-Id: Id77630e986146853377916f1551ea48d7ad904bf