(Bug 57726) add variant unicode string, not a list

Synchronize with compat

Change-Id: If8d6e2ebc37af34f4d751642602ab4aabbdf2e1c
Merge "(Bug 57726) add variant unicode string, not a list"