Merge "Lock down String8.isEmpty() usage" into main