am 75f0b792: am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev

* commit '75f0b792547f699761cb2b538b1dc1d020567238':
  DO NOT MERGE Fix vulnerability in mediaserver