Merge "Recognize new warning messages." am: b0553ca65b am: d95f164112 am: b6e37662ba
am: 6b4ce491f2

Change-Id: I11efbfa60fa741938b0abc6f3a6945f4ce98e39e