Failmail includes raw unicode rather than escaped

Change-Id: I696285a5117cd90d0fa2a93e9fe798260ebce987
Merge "Failmail includes raw unicode rather than escaped"