Merge change I948415fd

* changes:
  Delete the old rollo sample which is obsolete.