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