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

Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f