Merge change 26164 into eclair

* changes:
  Reset backup tracking in response to transport data-wipe notification