Merge "updater_sample: add UpdaterState" am: 721f6d851f am: b2a0611ea7
am: 57c4fe1f33

Change-Id: I89a27867da037937a09224a03450c261a1b3373b