Merge "fix null terminated string parsing" into pi-dev
am: c4a633e4f2

Change-Id: I6b24176d1f52fe6dc53e19c3ebe732fd04ae66a2