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

Change-Id: I583851fe62edd29851c86121794ef36695c9389f