Merge "Make sigchain actually own the signal chain." am: 931507c4d1
am: 5fe138b743

Change-Id: Ied9c092097cf68eb41a4028916efa113001741b6