Merge "Perform cleanup operation on destroy()" into udc-dev