Merge "Convert Vector usage to std::vector" into udc-dev