Merge "Minor refactor to support strings with embedded zeros."
am: db2ffaa0f0

Change-Id: I849a3d8b50d1a170e08b413e2d806d25b178cdf7