Merge "Recognize new warning messages." am: b8f6f5dced am: 70a851d9c5 am: 4b62375ee1
am: 8514848ae2

Change-Id: I086d0ed31365ed52f700a5d047663c3cf9305867