am a63276ed: am 90d8a6a4: Merge change 25628 into eclair

Merge commit 'a63276ed69ef10ec5cc29a5c3b392a268d25bf07'

* commit 'a63276ed69ef10ec5cc29a5c3b392a268d25bf07':
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup