Merge "Add 1 byte for the NULL char. This bug was causing CTS failures and stack corruption for Mips."