Merge "Add product variants for unicorn strings." into tm-qpr-dev