Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev