Merge "Remove unnecessary dependencies on libsigchain." am: 52c9985c8d
am: 994ab60292

Change-Id: Id979ce9096fd8c34b4d296575c9930177ac0b174