am 17e4eca8: am ebbf395f: am faced8cd: (-s ours) am 813c5022: am 1ac11129: am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev
* commit '17e4eca8':
Fix for security vulnerability in media server DO NOT MERGE