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

Change-Id: I58a28275c6ebb3850824ff85670fa50c1344af2e