am: 597be616 * commit '597be616': Added additional cbs channels support Change-Id: Ibacf62058f18cc471bbe3c365b980df11f6e991b