Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo...

am: 7996b96311

* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: I99540dd3060f1fe8467ac8207976e420c8b7635f

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge