Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev
am: b975b333af

Change-Id: Icdde985be117189f1445bc78f3c94da236fec0df