Merge "updater_sample: fix UpdateConfig" am: 7217e7045d am: 48294e3d86
am: cc65b655bb

Change-Id: Ia72f37dd0d43dfec957c48da3cebb369800a43d0