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

* commit '3b86306943e199e000302eec1902fc51be2e0637':
  Fix for security vulnerability in media server