Merge "Reconstruction the multi-device test" into udc-dev