hotfix unicode container merge problem

Change-Id: I2509f55c104a32ac48f76a2ece47a65e972b68ab