Incremental gateway resolution refactor.
Incremental gateway resolution refactor.

mwutzke/faucet,REANNZ/faucet,shivarammysore/faucet,mwutzke/faucet,gizmoguy/faucet,anarkiwi/faucet,isomer/faucet,anarkiwi/faucet,trungdtbk/faucet,trungdtbk/faucet,faucetsdn/faucet,byllyfish/faucet,trentindav/faucet,shivarammysore/faucet,gizmoguy/faucet,REANNZ/faucet,wackerly/faucet,trentindav/faucet,Bairdo/faucet,byllyfish/faucet,Bairdo/faucet,wackerly/faucet,isomer/faucet,faucetsdn/faucet