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