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

Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72