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

Change-Id: I188441196255ffe132adef00728502101199756b