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