Fix applying REPLACE_XZ operation when verifying payload.
am: 8adc1ad363

Change-Id: I1db7923438b088dbb75c806715682cb1e7132c8c