Merge "Minor refactor to support strings with embedded zeros." am: db2ffaa0f0 am: 417119922f
am: 87910a986a

Change-Id: I9b19879de6f3822746fee46d4d4294b4a3e23f9e