Merge "updater_sample: fix payload spec tests" am: 684d7216e6 am: 7c8e5b6ee8
am: 31b517c510

Change-Id: I9a8101831c087d98fa3350a754ef5ffcff8ce592