Merge "Fix Unicode string handling" into pi-dev am: 47f61f07ca
am: d60bb0bc80

Change-Id: I1611bce812c5751f2d0c9a473cf4672d2a1a56b1