am 6bca421b: am b48d082f: am dcc3ea28: (-s ours) Merge "Update the samples code"

* commit '6bca421b7d2340eb05a717e75ec6bba729f60dce':