am d623f766: am 422b2e53: Merge "Fix typo in option parsing."

* commit 'd623f7667ef1dec319d4c69690d2e22fc76cb23f':
  Fix typo in option parsing.