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

Change-Id: Ic9fc5ea0e8a1867acb98899d58eb136e545c8324