Merge "Block SIGPIPE in IptablesRestoreControllerTest."
am: 292147801e

Change-Id: I34aa92519ee7eeb0d5fe33977d978f4ef76027d0