Merge "Make support lib unicodeWrap() return null if the input string is null." into lmp-mr1-ub-dev