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

Change-Id: Icae9420f47512d47a165fc91808f8f596edd329a