DO NOT MERGE : backport of backup transport whitelist
am: 647cb6a6d8 -s ours
* commit '647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241
This commit is contained in: