Merge "Fix VerifyAuthorizationResponse error setting" am: 6a469e95ff am: ca99230e67
am: d17fe6aba1

Change-Id: I17713362cbc411a3d48c159207bf32aa2a0f49c0