Merge "Add tv product variants to strings." into lmp-mr1-dev