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

Change-Id: I115fe9e794023cbcc9b4238d14eefe469f9d6179