am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null if the input...
am d3143a3f: am e1fcced6: Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
* commit 'd3143a3f':
Make unicodeWrap() return null if the input string is null.