Merge change 27203 into eclair

* changes:
  Tighten up sample code.