Merge "Fix String16 operator+ to actually work"