am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

* commit '6272fa1baf361a6a89607243638cc592047947b3':
  DO NOT MERGE Fix vulnerability in mediaserver