am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev

* commit '99e63e75b670aeca1b4af401cb9582ba9fddf64d':
  Fix for security vulnerability in media server DO NOT MERGE