Merge "Don't use String8::empty" into main