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

Change-Id: Ia07ad2a2da74bc8e42dcf62bb05dc228907e529f