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

Change-Id: I9cef3561a5350d7d3a4f06ae177ca973d21fc8ee