Merge "sample_updater: add tests resources" am: 7d064166ce am: 6131d00348
am: f3cb640f1b

Change-Id: I504ed72c8ba3c96e87355fe1d1be667d0033442c