am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"

* commit 'af69e81834d09a02a6bfe1b685e66cd007243373':
  nuplayer: do not use cached source for wvm content -- DO NOT MERGE