Merge "Implement the discovery of a network recommendation provider." am: 470d256519 am: 8fbeb1d74a am: af811c2650
am: d0d32e238e  -s ours

Change-Id: Ic0c92afffa6db717621df9b10f75f4f76443b6a9