Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca9 am: acbf5926 am: cb3f75cc am: 6a848fdf -s ours Change-Id: I5f94537db2313fab72d363c9e4f78e9ac3379a67