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

Change-Id: I1e13f2c199c090f9063d132f90966dcae0a96338