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

Change-Id: I0193cc14eecb868b4bc4f47fe10d07aa4e787a5c