Merge "Don't print 168^W143 lines of help when someone makes a typo." am: 887b6b9a4b am: fde95b8844
am: 9daec1f94d

Change-Id: I41bca3777724792eb429e8b288831336caa5daec