am 7dfecb86: Merge change Iaa6e73a6 into eclair

Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-plus-aosp

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests