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

* commit '7d1cd4aae2aa42172abdff00ec1601248cf92b02':
  Tunneled Video Playback support