Cherry-pick a upstream patch for a data loading bug Upstream CL : http://bugs.icu-project.org/trac/changeset/37670 BUG=508444 TEST=See bug R=inferno@chromium.org Review URL: https://codereview.chromium.org/1233663005 .