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

Change-Id: Id867df817a3a09f53cb1a11e3d7152f8cc532b7f