sixish: handle Unicode strings in the environment am: ce3ab294 am: 11fd8073 am: 53705e06 am: 3a9ea004 am: 84044ecc Change-Id: Id5f1da0afe878e3dffba467484a4c175f37f2428