am 96cbcbfe: Merge "Cleanup example code."

* commit '96cbcbfe176f3dc794fc9266c838ef71732e3e6c':
  Cleanup example code.