Merge "comply with VTS requirements" into udc-dev