Merge "updater_sample: improve updater state handling" am: 269be9f22d am: 188190cc8c
am: ca9d2d71bf

Change-Id: I234998d1beecc297a5e2bdda2f6334e27f27fc0a