DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6 -s ours...

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6  -s ours am: 077534b1 am: 4c559cda am: 24ceca96  -s ours am: 88c9eae8 am: 1fa817c0 am: 040cf140 am: 0905c8f3  -s ours am: d39c0a8d
am: d8e548f6

* commit 'd8e548f6':

Change-Id: I25c53c4fe1a0ece0d9c20e339f26a81f5cf62d78