am 804c4e80: (-s ours) Merge "TV: fix tests to match updated framework behavior DO NOT MERGE" into lmp-sprout-dev

* commit '804c4e80b9c91bb10c310f5ca2cc0cfefd55d5a8':
  TV: fix tests to match updated framework behavior DO NOT MERGE