Merge "Better pattern matching and dump of warning messages."
am: 6949e7ecba

Change-Id: Ib643d3e03eb22ec4929054d4ab8542dd62b8963b