Merge "Add missing nullptr checks for data.readCString() strings"
am: ce961d374f

Change-Id: Id45f58c1c231d5212fc8d1807dbd7255dadfc65f