Merge "mediaserver still needs icu" into nyc-dev
am: 959f8b5684

* commit '959f8b5684f3d45709a89e133c27a4bf269cbb0e':
  mediaserver still needs icu