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

Change-Id: I6817f8f9c7a83400a710144a8b57b6303082201f