Merge "sample_updater: add non-streaming demo"
am: 4816fc1c46

Change-Id: Ide07a80e18a3935c07e020b51d730aa6f557077c