Recent conversion from char* to String8 broke these. Change-Id: I4528c3e4b90614cddbc173ee996c7fc1febb2cf5