am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media...
am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev
* commit 'd83f2255':
Fix for security vulnerability in media server DO NOT MERGE