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

* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
  Backport of backup transport whitelist

Change-Id: Iaac686d1ac503ab9799a1de1d10f8bb874d8199a