DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101
am: 4c559cdade

* commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142