Merge "Recognize new warning messages."
am: b8f6f5dced

Change-Id: I1d3ee3bed661be31f03b76e5c2abfd3e56d18bff