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

Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177