Merge "Remove explicit dependency on bouncycastle"