Minor refactor to support strings with embedded zeros.

Test: manual
Change-Id: Iaece3003deb257cbcae65a23a4c4a1ccfd690d49
1 file changed