am 11232b0a: Fix for a hang when attempting to stream a non-existing content.

Merge commit '11232b0a86408237d8f4f6ebe324a27d27d72ca3'

* commit '11232b0a86408237d8f4f6ebe324a27d27d72ca3':
  Fix for a hang when attempting to stream a non-existing content.