Don't break command line arguments unnecessarily
Don't break command line arguments unnecessarily

Change-Id: I45e8a777bce8798b90cdb93521a32a2353348279

flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast