Merge "Backport of backup transport whitelist" into mnc-dev