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

Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55