Merge "Revert "Route backup data through IntermediateEncryptingTransport""