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

* commit 'a4438be1f7e9529e4100e0998d9e1ace75c4f358':
  Fix cmdline parser test.