Escape diff output

Change-Id: I7cb5a8c89247b44306a99d781d6cc9e3291d9eb4