am cc2566f1: Merge "Tunneled Video Playback support" into lmp-dev

* commit 'cc2566f12760d66837b52213e5ffd2cb30cce19e':
  Tunneled Video Playback support