Merge "updater_sample: validate state only once" am: 02ee7bf29d am: 8bb3085865
am: a64639f104

Change-Id: I1900eaa91fbc95d82c7cdf51254df5289386fb68