DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af  -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047
am: 0905c8f398  -s ours

* commit '0905c8f3989ab607b659fdc20a1b9a56794d2b6f':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I6d0b878ea43d98761b93865604e8cb97410cdea9