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

Synchronize with core

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