Merge \\\"Don\\\'t loop forever on 0-length options.\\\" into nyc-dev am: 7aac630f8e am: affc4c1347
am: 44e6ac0c40

Change-Id: I4bea027753bd0c9564a6d5b52440ab223864b3a0