Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am: 0f101342e1

Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6