am 63bc386d: am 92aa4238: move to backup helper architecture

* commit '63bc386d566ce4887ffe231f279b6b6e1ee6f5f3':
  move to backup helper architecture