Merge "Revert "comply with VTS requirements"" into udc-dev