Merge "Fix spelling error in warning" am: 79e0fb87eb
am: e3c1d61a89

Change-Id: I633f2f9ee412ac36239b4423062bb3d41197981b