Merge "updater_sample: add metadata mismatch error code" am: 9ed4b41478 am: c48f0b6923
am: d05624fbe0

Change-Id: I51408f698d934782441c8f75cefe3da390390f34