Merge "Handling potential SIGPIPE signals." am: 935f97ade5
am: 7790552308

Change-Id: I48058c9c2ac1bbf634ef02f68979a54dd0a13826