dxcli-1234 change everything

Change-Id: I0b6b664b6d4b911858e9b1f73f12125b6c92bdf2