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

Change-Id: I99a31b6aa291b49861f9158b11260c30aac88b88