Merge "Deal with null characters in string options." into m-wireless-dev