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
* commit '84dd33d8e54bf175fe4045999202cc92ef6fb948':
Backport of backup transport whitelist
Change-Id: I1ed0336ab110d291d92df781beb4cac272c1bc63
This commit is contained in: