Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 am: 84dd33d8e5
am: fd752502a6
* commit 'fd752502a684268d526dd0743bd7a17bc277cd2b':
Backport of backup transport whitelist
Change-Id: I92a155ef2fd5293273d6c1d1e254b52e52087e31
This commit is contained in: