Reland "Add optional signal forwarder and '-z' option to cli" am: dba6209b4f
am: 2e3caf3c6e

Change-Id: I8ae7b105835e9c4746e1e733fc54de87021afa80