Merge "Remove icu4j dependency." am: 6963081c5b am: 794be8d45f
am: f2b27fc624  -s ours

Change-Id: I3a1f04d39b3d76e1ef3f43d0d09f696fdf3aeda2