resolving conflicts

Change-Id: I6d80f6aba1c6bb6467bca39ed0d900d67959059b
trying to wrap in unicode

Change-Id: Id55470f1b9fcd9c984d56b9ea2624946db09062b