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

Change-Id: Ic6e96b9ff3ecc609c40f8c5d5367a789b3732b7e