Merge "Remove deprecated OpenSSL methods"