am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

* commit '52b829cbc2cb947733f312211a007ecd2f9fe96b':
  Fix for security vulnerability in media server DO NOT MERGE