[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2

Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60