Merge "Added additional cbs channels support" into nyc-mr1-dev