Merge "Remove unused ScopedIcuLocale.h in test"