Merge "Tell the resolver what protocols to use." into ics-factoryrom