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
* commit '24ceca96':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663