Merge "Fix CTS retry command line parsing to handle key-value args" into oc-mr1-dev am: 5523959049
am: e45b3ff273

Change-Id: Ic9b35a27546a17df9f9af5db49987e162afc22ca