am 2980473b: am 9f6e6c0d: Fix NPE when calling unicodeWrap DO NOT MERGE

* commit '2980473b5bead6dcb52535b8434db78a4fa844f6':
  Fix NPE when calling unicodeWrap DO NOT MERGE