Merge "[DO NOT MERGE] - Add transcoding columns to mainline-prod" into mainline-prod