Merge "Fix information disclosure in mediadrmserver" into oc-dev