Merge "Update locale data from in-tree ICU"