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

Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3