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

Change-Id: I4db6b16c327324e220011f9512e067e6c6015c9d