am 2a4a40e9: am aa546803: am c0aac4d2: am 11e24e5f: (-s ours) Update sample code due to API changes

* commit '2a4a40e9d619a379a063505f0abe31959f89abae':