Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 am: 25d31c9f9c
am: 901fb2c811

Change-Id: I8848adc74153293256f780fefaa05c579eda359d