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

Change-Id: Ibeb37434157360118eaa05555640bdcc4f1131c8