Fix company name encoding in UI

Change-Id: I0fda3f207b172303afc4426f954b85ebad4bfdae