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

Change-Id: I505ed56724599fae6d9514e136003caf26d96346