am 8a877f09: (-s ours) am b566a55e: am da9c517a: am 93e3abfc: am 48904845: am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
* commit '8a877f09':
Fix for security vulnerability in media server DO NOT MERGE