Merge "Don't build NetworkRecommendation." into oc-dev am: b8fbe77a30
am: e23762164e

Change-Id: I3f28235763d7c3ef1f4217dc1e380636a585d244