Merge "mediaserver still needs icu" into nyc-dev