Merge "updater_sample: update tests" am: 219445a320 am: f3d1e58163
am: aa1fd35492

Change-Id: Id7e5337a3538b7bb79771a71cea10dfda1af8a75