Merge "Fix comparison of String8 to char* literal"