Merge "Fix for security vulnerability in media server" into mnc-dev