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

Change-Id: Ie272b010c4fbb9da33f9832c8594846cebfaaf16