am 41db0959: (-s ours) Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev

* commit '41db09593f96303dfed57c5e87b581a74950d055':
  DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases