Merge "Remove the dependency on ICU"
am: 97048ee337

Change-Id: I829ff633e9ff4b0a93fd1974f2ea4917e2e21aef