Merge "Don't call ERR_error_string in keymaster"