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

Change-Id: Icedd33aa2cb5a4a76e2ab7a0be2a2051a40b8624