Merge "Don't build NetworkRecommendation." into oc-dev