Merge "Remove icu4j dependency."
am: 6963081c5b

Change-Id: Ifc8cd0946bd069837fb46f3f8f9d85df715ab4de