am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair

Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp

* commit '21eb173864670c2f759258016d95f0bcd06313e7':
  Revive backup tests