Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev
am: cd339f211a

Change-Id: I31dc7073d276b710d66cc977ee09cbfea2893e55