Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa am: 600d4f61 am: c69aa838 am: 38a37f33 -s ours" into nyc-dev