Merge "Use new Severity class and update *_warn_patterns"
am: ecfd19d576

Change-Id: If5e69478078c18e961b059dc7feae57663971ef1