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

* commit '389e765394a950b9697bba49c1998f2029bd58b4':
  Fix for security vulnerability in media server