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

Change-Id: I84b77e625d5b524bad03a9392ed5313a3b22b8cb