am 3a66413a: Merge change 25992 into eclair

Merge commit '3a66413af33f2f2a3511f644efe5b4e45198d7df' into eclair-plus-aosp

* commit '3a66413af33f2f2a3511f644efe5b4e45198d7df':
  Add an 'init everything' operation to the first backup pass