Merge "brillo: Remove dependency on icu for Brillo."