Merge "InputStream for RSA file should not be static"