Merge "Remove unused ICU headers"