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

* commit 'dd4408013c64a3c40d498743a9d6cbad144de072':