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