Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am: 7aac630f8e am: 5719a7f478
am: 1767dd1af7

Change-Id: I276bd8cafdc0985f1e5ce4a40ed253e8dc93ce2d