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

* commit '98a09c64d52aa1166a09ab071049bc3536def1cd':
  Fix sample code issues