Merge "Use String8/16 c_str (mainline modules)" into main