Merge "Tell the resolver what protocols to use." into ics-factoryrom
tree: eff11f615a7a1efdf3634ae181065b1862e09b31
  1. core/
  2. services/