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

Change-Id: I4b3f236bf46be66e124d52b404a77e174b1db7b3