Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev