Merge "Fix typo in product string" into udc-dev