Merge "Fix VerifyAuthorizationResponse error setting"
am: 6a469e95ff

Change-Id: I22c0be4ba300147c20d68a589700d84bed8cf6b8