[automerger skipped] Merge "Remove the dependency on ICU" am: 97048ee337 am: ea84e78b5d
am: 2b2d36c616 -s ours
am skip reason: change_id Ib843fb1071a634f25e27e5291b00d11852ac08a9 with SHA1 811024860a is in history

Change-Id: I18d325054695394c00e6ad22cbc03921003f3b40