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

Change-Id: I351f0df469be67b5998567d7fb9ff0163d613a1d