Merge "Fix malformed UTF-8 going to query profiler"