Merge "Recognize new warning messages." am: b8f6f5dced
am: 70a851d9c5

Change-Id: If13c32d6bd39bebd9534145b34a7af2d8175a70d