am 43174b7d: am 718fb9f1: Fix sample code issues

* commit '43174b7d2250d5afecabd5a97d2f7fbddc753fd7':
  Fix sample code issues