Merge "Fix Unicode handling." into pi-dev am: 59f888d94c
am: c744ab4c30

Change-Id: I4a988f695a1653d05453dacf8fce21b288d63c1d