2cad992023
Bring the API samples up to date with the current code. Change-Id: I6a4d8dff6410227b653f25714fc0d468c76052d5