am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev

* commit '2cca8962327b2d988bf5172e4142268fa3795b57':
  update video playlists and marquee announcements