Merge "Revert "Make sigchain actually own the signal chain.""
am: 89b0d93369

Change-Id: Ia6a07347dced8740bc91f67ee6b71b5d4e35e32d