Merge "Add compatibility wrappers for ISecureClock and ISharedSecret"