Merge "Remove unnecessary dependency on bouncycastle"