am 718fb9f1: Fix sample code issues

* commit '718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
  Fix sample code issues