Merge "Fix cmdline parser test." am: 090a481ca6 am: a4438be1f7
am: 266f521e58

* commit '266f521e58a2aba8a971a216adbf739b884006f1':
  Fix cmdline parser test.