Merge "Fix VerifyAuthorizationResponse error setting"