Merge "sigchain: properly block signal when we forward." am: cd4590dab3 am: 767693a4df
am: a56d8a27d3

Change-Id: I3aee84fd9094aa7f01c597366699b59aa084515e