Fix encoding issues for non-ASCII company names

Change-Id: I466cccb5f24e78c791d7a060a1e0d06b9465e3c8
Merge "Fix encoding issues for non-ASCII company names"