Merge cherry-pick of upstream to M45 branch

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
TBR=inferno@chromium.org

Review URL: https://codereview.chromium.org/1233663005 .

Review URL: https://codereview.chromium.org/1267783004 .
3 files changed