Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into...
Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev am: e75f7732
am: 83f70c10
* commit '83f70c10':
TIF: Drop the requirement for ID tuple for non-broadcast channels