Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp * commit '21eb173864670c2f759258016d95f0bcd06313e7': Revive backup tests
Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp * commit '21eb173864670c2f759258016d95f0bcd06313e7': Revive backup tests