Merge "Close VirtualDevice when CDM association is removed" into udc-dev