Merge "TIF: Add internal provider ID field to channels"