Merge "Slightly refactor signal handling and fd closing" am: 1f332b2dde am: 69c1204d6d
am: c30c6a1a6e

Change-Id: I5f015468cf144c07f17305cb55efebecfe486244