Merge "Migrate UnicodeString usage to equivalent C API"
am: 401a214792

Change-Id: I03f265f52da8c2871ee51c1355cb43f1fca63883