Merge "Fix warning while building mediaserver"