Merge change 3439

* changes:
  updating sample plugin to use lifecycle events.