Merge "New pref toggle for network recommendations." am: a5249906ab
am: 2b03ffb264

Change-Id: Ie4f4255740559a3018ba84df0084ff94995aa87d