am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev

* commit '594ac1575f8301023d37c329f8c676ba9bda396c':
  TvContract: Address the feedback from the API review