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

Change-Id: Ic5f5ab61029d809e0f09538256c9969d5937a6ce