Merge "Delete unused direct share expansion code" into udc-dev