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

Change-Id: Id0af1e1b4a2e977a9837dfcca1f9de903d7a33ce