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

Change-Id: Iab3c375e790180febe21bcc0587a101887b23c38