Handle unicode strings in merge-dict

Change-Id: I07958aa5f06ab74f2a5ff8f568897863426ba04f
Merge "Handle unicode strings in merge-dict"