Fix cli arguments backward compatibility

Change-Id: I36760e9b466c519690c6773545e1c9764afc2a7d