Merge "Use ICU APIs not impl types" am: 811d817368 am: 09dcb87982
am: ccef9d9dc2

Change-Id: I302247aa892e018e58b6742f55d30c971a4f77f3