Merge "Refactor BindToDeviceSocketMutator." into udc-dev