Merge "Fix VerifyAuthorizationResponse error setting" am: 6a469e95ff am: ca99230e67
am: 17b56a79c8

Change-Id: I78a3ea46c0b9844457124926656b2d9fb999d3a7