Forward port Emoji and Strip unicode support

Change-Id: I6adb081d45389adef825d8bb1e431174a4ca416f