Merge "Remove default network recommendation provider." into oc-dev