am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev

* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.