Merge "Remove TIS command line arg handling" into udc-qpr-dev