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

Change-Id: Icd3c0265ffb30232642f581a7c0031ed55ee6d21