Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c am: acbf592683
am: cb3f75cca7

Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee