am 48099069: am 3b863069: am 389e7653: Merge "Fix for security vulnerability in media server" into mnc-dev

* commit '480990699cd571e475788bfba8ef86bd0bfb96ad':
  Fix for security vulnerability in media server