fix handling of consecutive optional arguments am: fea05c6dca
am: 76bdc68d7e

Change-Id: I0ba1f462bfc23ddf2c3df4b371a0bff298174e84