Merge "Remove icu4j dependency." am: 6963081c5b
am: 794be8d45f

Change-Id: Idd805b56e75dab3c586847b5fdc9eaf8db248d58