Fix for security vulnerability in media server DO NOT MERGE bug: 23540426 Change-Id: I7ca419e4008967a0387649e5293ac9d4be71d3c4