am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev

* commit '4554ffd7a1c4bc6973c11c00f5a19aa260e18100':
  DO NOT MERGE Fix vulnerability in mediaserver