Merge "Add prepareToDisconnectExternalDevice." into udc-dev