[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e98 am: 0231bc4d am: 83cb3545 am: 4405b0ce am: b3012285 Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60